Skip to content

chore: Remove duplicate lines in crates/zed/build.rs#22500

Merged
osiewicz merged 1 commit intozed-industries:mainfrom
huacnlee:patch-1
Dec 30, 2024
Merged

chore: Remove duplicate lines in crates/zed/build.rs#22500
osiewicz merged 1 commit intozed-industries:mainfrom
huacnlee:patch-1

Conversation

@huacnlee
Copy link
Contributor

@huacnlee huacnlee commented Dec 30, 2024 •
edited
Loading

Release Notes:

  • N/A

This may a mistake by merge in PR #21550

zed/crates/zed/build.rs

Lines 8 to 14 in 344284e

if std::env::var("ZED_BUNDLE").ok().as_deref() == Some("true") {
// Find WebRTC.framework in the Frameworks folder when running as part of an application bundle.
println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path/../Frameworks");
} else {
// Find WebRTC.framework as a sibling of the executable when running outside of an application bundle.
println!("cargo:rustc-link-arg=-Wl,-rpath,@executable_path");
}

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 30, 2024
@osiewicz osiewicz added this pull request to the merge queue Dec 30, 2024
@osiewicz
Copy link
Member

osiewicz commented Dec 30, 2024

Thanks!

Merged via the queue into zed-industries:main with commit 5f4f3a9 Dec 30, 2024
@huacnlee huacnlee deleted the patch-1 branch December 30, 2024 12:08
helgemahrt pushed a commit to helgemahrt/zed that referenced this pull request Jan 1, 2025
@huacnlee @helgemahrt
chore: Remove duplicate lines in crates/zed/build.rs (zed-industries#…
d47db5d 
…22500)

Release Notes:

- N/A

This may a mistake by merge in PR zed-industries#21550


https://github.com/zed-industries/zed/blob/344284e01331667c018e6ade5d791a20598a3a5c/crates/zed/build.rs#L8-L14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@huacnlee @osiewicz